(find-file-noselect): If after-find-file switches buffers,

return the buffer that it leaves current.

diff --git a/lisp/files.el b/lisp/files.el
index 31c7f257ce7d64530d569d5d206f1f7277372e6a..309410ba9923f080f8c1c4633ef75ab14d72ef67 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -829,7 +829,8 @@ The buffer is not selected, just returned to the caller."
                 (setq backup-inhibited t)))
          (if rawfile
              nil
-           (after-find-file error (not nowarn)))))
+           (after-find-file error (not nowarn))
+           (setq buf (current-buffer)))))
       buf)))
 \f
 (defvar after-find-file-from-revert-buffer nil)